merge emacs-23
authorKenichi Handa <handa@m17n.org>
Fri, 24 Dec 2010 08:49:24 +0000 (17:49 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 24 Dec 2010 08:49:24 +0000 (17:49 +0900)

Trivial merge